From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 5 Jun 2009 01:58:53 +0000 (+0000)
Subject: (epa-decrypt-region): Detect encoding if
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~490
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=57a66e95d18d20a9473d5ba6a5ec5d66f36e925a;p=emacs.git

(epa-decrypt-region): Detect encoding if
coding-system-for-read is not specified.
<http://sourceforge.jp/ticket/browse.php?group_id=2267&tid=17018>
(epa-verify-region): Ditto.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 651cd1c49a3..0616ca6eaa2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-05  Daiki Ueno  <ueno@unixuser.org>
+
+	* epa.el (epa-decrypt-region): Detect encoding if
+	coding-system-for-read is not specified.
+	<http://sourceforge.jp/ticket/browse.php?group_id=2267&tid=17018>
+	(epa-verify-region): Ditto.
+
 2009-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* tar-mode.el (tar-header-block-tokenize): Obey @LongLink even for
diff --git a/lisp/epa.el b/lisp/epa.el
index 0e8c92390af..36c261a4e26 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -830,7 +830,8 @@ For example:
       (setq plain (epa--decode-coding-string
 		   plain
 		   (or coding-system-for-read
-		       (get-text-property start 'epa-coding-system-used))))
+		       (get-text-property start 'epa-coding-system-used)
+		       'undecided)))
       (if (y-or-n-p "Replace the original text? ")
 	  (let ((inhibit-read-only t)
 		buffer-read-only)
@@ -919,7 +920,8 @@ For example:
     (setq plain (epa--decode-coding-string
 		 plain
 		 (or coding-system-for-read
-		     (get-text-property start 'epa-coding-system-used))))
+		     (get-text-property start 'epa-coding-system-used)
+		     'undecided)))
     (if (y-or-n-p "Replace the original text? ")
 	(let ((inhibit-read-only t)
 	      buffer-read-only)